Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pass parameters explicitely in QueryPlannerRequest instead of context #6208

Open
wants to merge 10 commits into
base: dev
Choose a base branch
from
Open

Pass parameters explicitely in QueryPlannerRequest instead of context #6208

wants to merge 10 commits into from

Conversation

Geal
Copy link
Contributor

@Geal Geal commented Oct 29, 2024 •
edited
Loading

Follow up to #6108 to pass query planner arguments directly in the request struct instead of the context

Checklist

Complete the checklist (and note appropriate exceptions) before the PR is marked ready-for-review.

  • Changes are compatible1
  • Documentation2 completed
  • Performance impact assessed and acceptable
  • Tests added and passing3
    • Unit Tests
    • Integration Tests
    • Manual Tests

Exceptions

Note any exceptions here

Notes

Footnotes

  1. It may be appropriate to bring upcoming changes to the attention of other (impacted) groups. Please endeavour to do this before seeking PR approval. The mechanism for doing this will vary considerably, so use your judgement as to how and when to do this. ↩

  2. Configuration is an important part of many changes. Where applicable please try to document configuration examples. ↩

  3. Tick whichever testing boxes are applicable. If you are adding Manual Tests, please document the manual testing (extensively) in the Exceptions. ↩

@Geal Geal requested review from a team as code owners October 29, 2024 14:51
@svc-apollo-docs
Copy link
Collaborator

svc-apollo-docs commented Oct 29, 2024 •
edited
Loading

✅ Docs Preview Ready

No new or changed pages found.

@Geal Geal marked this pull request as draft October 29, 2024 14:51
@github-actions GitHub Actions
Copy link
Contributor

@Geal, please consider creating a changeset entry in /.changesets/. These instructions describe the process and tooling.

@router-perf
Copy link

router-perf bot commented Oct 29, 2024

CI performance tests

  • connectors-const - Connectors stress test that runs with a constant number of users
  • const - Basic stress test that runs with a constant number of users
  • demand-control-instrumented - A copy of the step test, but with demand control monitoring and metrics enabled
  • demand-control-uninstrumented - A copy of the step test, but with demand control monitoring enabled
  • enhanced-signature - Enhanced signature enabled
  • events - Stress test for events with a lot of users and deduplication ENABLED
  • events_big_cap_high_rate - Stress test for events with a lot of users, deduplication enabled and high rate event with a big queue capacity
  • events_big_cap_high_rate_callback - Stress test for events with a lot of users, deduplication enabled and high rate event with a big queue capacity using callback mode
  • events_callback - Stress test for events with a lot of users and deduplication ENABLED in callback mode
  • events_without_dedup - Stress test for events with a lot of users and deduplication DISABLED
  • events_without_dedup_callback - Stress test for events with a lot of users and deduplication DISABLED using callback mode
  • extended-reference-mode - Extended reference mode enabled
  • large-request - Stress test with a 1 MB request payload
  • no-tracing - Basic stress test, no tracing
  • reload - Reload test over a long period of time at a constant rate of users
  • step-jemalloc-tuning - Clone of the basic stress test for jemalloc tuning
  • step-local-metrics - Field stats that are generated from the router rather than FTV1
  • step-with-prometheus - A copy of the step test with the Prometheus metrics exporter enabled
  • step - Basic stress test that steps up the number of users over time
  • xlarge-request - Stress test with 10 MB request payload
  • xxlarge-request - Stress test with 100 MB request payload

Geal
Geal commented Oct 29, 2024
View reviewed changes
apollo-router/src/query_planner/caching_query_planner.rs
@@ -326,20 +322,12 @@ where
}
};

let schema = self.schema.api_schema();
if let Ok(modified_query) = add_defer_labels(schema, &doc.ast) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is already called inside BridgeQueryPlanner

Geal
Geal commented Oct 29, 2024
View reviewed changes
apollo-router/src/query_planner/bridge_query_planner.rs
@@ -635,19 +627,9 @@ impl Service<QueryPlannerRequest> for BridgeQueryPlanner {
operation_name.as_deref(),
Arc::new(QueryHash(hash)),
)?;
context
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that one was correct (and removing this is probably what triggered the snapshot changes). The defer labels modification was added in #3298 to be able to track which deferred response was linked to which fragment in the query, but this is a modification that should not be apparent anywhere else than in the planner and execution service. If we end up exposing the ApolloCompiler instance to user plugins, it should not contain those labels

@Geal
Copy link
Contributor Author

Geal commented Oct 30, 2024

it will conflict with the fix in #6108 because it proposes another way to fix it, but that will be easy to resolve

@Geal Geal marked this pull request as ready for review October 30, 2024 08:26
@Geal Geal mentioned this pull request Oct 30, 2024
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Geal @svc-apollo-docs